Usenet 1993 July

home *** CD-ROM | disk | FTP | other *** search

/ Usenet 1993 July / InfoMagic USENET CD-ROM July 1993.ISO / sources / x / volume6 / xfig2 / patch5b < prev next >

Wrap

Internet Message Format | 1993-04-28 | 54.5 KB

From: envbvs@epb2.lbl.gov (Brian V. Smith) Newsgroups: comp.sources.x Subject: v06i051: xfig 2.0 (part 2/7), Patch5 Message-ID: <133692@sun.Eng.Sun.COM> Date: 30 Mar 90 04:32:35 GMT Approved: argv@sun.com Submitted-by: envbvs@epb2.lbl.gov (Brian V. Smith) Posting-number: Volume 6, Issue 51 Archive-name: xfig2/patch5b Patch-To: xfig2: Volume 6, Issue 9-24,34-36 #! /bin/sh # This is a shell archive. Remove anything before this line, then unpack # it by saving it into a file and typing "sh file". To overwrite existing # files, type "sh file -c". You can also feed this as standard input via # unshar, or by typing "sh <file", e.g.. If this archive is complete, you # will see the following message at the end: # "End of archive 2 (of 7)." # Contents: CHANGES.diff Imakefile.diff arc.c.diff changestyle.c.diff # drag.c.diff ellipse.c.diff f2p.man.diff intspline.c.diff # movept.c.diff undo.c.diff xfig.man.diff # Wrapped by envbvs@epb2.lbl.gov on Wed Mar 28 09:04:39 1990 PATH=/bin:/usr/bin:/usr/ucb ; export PATH if test -f 'CHANGES.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'CHANGES.diff'\" else echo shar: Extracting \"'CHANGES.diff'\" $5172 characters$ sed "s/^X//" >'CHANGES.diff' <<'END_OF_FILE' X*** CHANGES.p5 Mon Mar 12 16:20:50 1990 X--- CHANGES Tue Mar 27 17:20:32 1990 X*************** X*** 1,5 X Version 2.0 X X Patchlevel 4 X Changes from patchlevel 3: X X X--- 1,30 ----- X Version 2.0 X X+ Patchlevel 5 X+ Changes from patchlevel 4: X+ X+ o Line widths of zero now allowed for drawing borderless objects X+ o Resources now parsed in more portable way X+ o Variable "compound" changed to "cmpnd" in drag.c and search.c because X+ SunOs 4.1 has function called compound() X+ o Unknown "-" options no longer parsed as file name X+ o Filled areas now drawn opaquely instead of transparently X+ o Ruler arrows now drawn correctly X+ o Area fill for rounded corner boxes displays properly X+ o Lower panel buttons and rulers slightly smaller to allow 9.5 inch tall X+ canvas in portrait mode on screens that are "only" 864 pixels tall X+ o Imakefile now uses XawClientDepLibs instead of $(DEPXAWLIB) $(DEPXMUlIB) ... X+ o -1 for area fill (no fill) in TransFig files handled properly X+ o u_int defined as uint for SYSV systems X+ o 'figure_modified' flag cleared when editing new file X+ o If "save in" is done and there is no current file name, then the X+ current file name is set to the one specified in the save X+ o -track default is now True as man entry states X+ o side panel resource renamed to side_panel X+ o fixed bug in f2ps where filled arcs weren't filled X+ o line width and font support for f2p (pic) X+ Thanks to Dave Davey for these additions X+ X Patchlevel 4 X Changes from patchlevel 3: X X*************** X*** 4,9 X Changes from patchlevel 3: X X o Bug fixed in drawing zero-length lines with arrows X o Portrait/Landscape bug fixed (only appeared on Sun 4) X o Fig will not allow edit of new figure without confirmation if X current figure has been modified X X--- 29,35 ----- X Changes from patchlevel 3: X X o Bug fixed in drawing zero-length lines with arrows X+ Thanks to Dave Davey for this fix X o Portrait/Landscape bug fixed (only appeared on Sun 4) X o Fig will not allow edit of new figure without confirmation if X current figure has been modified X*************** X*** 14,20 X o Adds compatibility with Fig 1.4-TFX file format INSTEAD of 1.4X X as a compile time option (compiler flag -DTFX). No change to program X as compiled without the -DTFX flag. See file README.TFX. X! Credit goes to Micah Beck for this one. X o Fixed bug where scanf was doing %lf for text angle instead of %f X in read_textobject() X o #include <X11/Scroll.h> put back in fig.h for R3 - XtRFloat is defined here X X--- 40,46 ----- X o Adds compatibility with Fig 1.4-TFX file format INSTEAD of 1.4X X as a compile time option (compiler flag -DTFX). No change to program X as compiled without the -DTFX flag. See file README.TFX. X! Credit goes to Micah Beck (beck@cs.cornell.edu) for this one. X o Fixed bug where scanf was doing %lf for text angle instead of %f X in read_textobject() X Thanks to Leroy Hugues (Hugues.Leroy@irisa.fr) for this fix X*************** X*** 17,22 X Credit goes to Micah Beck for this one. X o Fixed bug where scanf was doing %lf for text angle instead of %f X in read_textobject() X o #include <X11/Scroll.h> put back in fig.h for R3 - XtRFloat is defined here X o XtPointer is only defined in R4 - uses caddr_t for R3 blink() routine X o User print to default printer, specify particular printer or print to file X X--- 43,49 ----- X Credit goes to Micah Beck (beck@cs.cornell.edu) for this one. X o Fixed bug where scanf was doing %lf for text angle instead of %f X in read_textobject() X+ Thanks to Leroy Hugues (Hugues.Leroy@irisa.fr) for this fix X o #include <X11/Scroll.h> put back in fig.h for R3 - XtRFloat is defined here X o XtPointer is only defined in R4 - uses caddr_t for R3 blink() routine X o Print figure on default printer, specify particular printer or print to file X*************** X*** 19,25 X in read_textobject() X o #include <X11/Scroll.h> put back in fig.h for R3 - XtRFloat is defined here X o XtPointer is only defined in R4 - uses caddr_t for R3 blink() routine X! o User print to default printer, specify particular printer or print to file X o Original FORMAT1.4 file included to compare new 1.4X format with 1.4 X New file that describes xfig file format is called FORMAT1.4X X o Drawing too-narrow ellipses doesn't loop forever anymore, but they X X--- 46,53 ----- X Thanks to Leroy Hugues (Hugues.Leroy@irisa.fr) for this fix X o #include <X11/Scroll.h> put back in fig.h for R3 - XtRFloat is defined here X o XtPointer is only defined in R4 - uses caddr_t for R3 blink() routine X! o Print figure on default printer, specify particular printer or print to file X! Thanks to Daren Latham (dwl@udev.cdc.com) for this one X o Original FORMAT1.4 file included to compare new 1.4X format with 1.4 X New file that describes xfig file format is called FORMAT1.4X X o Drawing too-narrow ellipses doesn't loop forever anymore, but they X*************** X*** 45,48 X Changes from patchlevel 0: X X o included definition of put_msg()/FREE/CFREE in f2ps.c X- X X--- 73,75 ----- X Changes from patchlevel 0: X X o included definition of put_msg()/FREE/CFREE in f2ps.c END_OF_FILE if test 5172 -ne `wc -c <'CHANGES.diff'`; then echo shar: \"'CHANGES.diff'\" unpacked with wrong size! fi # end of 'CHANGES.diff' fi if test -f 'Imakefile.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'Imakefile.diff'\" else echo shar: Extracting \"'Imakefile.diff'\" $3944 characters$ sed "s/^X//" >'Imakefile.diff' <<'END_OF_FILE' X*** Imakefile.p5 Fri Mar 2 10:46:24 1990 X--- Imakefile Tue Mar 27 16:05:19 1990 X*************** X*** 1,44 **** X SYS_LIBRARIES = -lm X! SYSAUX_LIBRARIES = -lXaw -lXmu -lXt -lX11 X! DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) X LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) X X- SRCS= addpt.c arc.c arcbox.c arrow.c autoarrow.c\ X- bitmap.c blink.c bound.c box.c break.c\ X- canvas.c changestyle.c changetext.c changethick.c \ X- char.c color.c copy.c cursor.c curve.c\ X- deletept.c dir.c drag.c draw.c ellipse.c\ X- file.c flip.c font.c free.c\ X- geom.c global.c glue.c graphics.c grid.c\ X- intspline.c latex_line.c line.c list.c\ X- main.c move.c movept.c msgsw.c\ X- panel.c popup.c print.c printfonts.c psbits.c psfonts.c puterr.c\ X- read.c read1_3.c redisplay.c remove.c rotate.c ruler.c\ X- save.c scale.c search.c spline.c\ X- text.c trans.c turn.c undo.c util.c xtra.c X X! OBJS= addpt.o arc.o arcbox.o arrow.o autoarrow.o\ X! bitmap.o blink.o bound.o box.o break.o\ X! canvas.o changestyle.o changetext.o changethick.o \ X! char.o color.o copy.o cursor.o curve.o\ X! deletept.o dir.o drag.o draw.o ellipse.o\ X! file.o flip.o font.o free.o\ X! geom.o global.o glue.o graphics.o grid.o\ X! intspline.o latex_line.o line.o list.o\ X! main.o move.o movept.o msgsw.o\ X! panel.o popup.o print.o printfonts.o psbits.o psfonts.o puterr.o\ X! read.o read1_3.o redisplay.o remove.o rotate.o ruler.o\ X! save.o scale.o search.o spline.o\ X! text.o trans.o turn.o undo.o util.o xtra.o X X! F2PSRC = arrow.c f2p.c free.c read.c X! F2POBJ = arrow.o f2p.o free.o read.o X X F2PSSRC = arrow.c bound.c f2ps.c free.c read.c psfonts.c X F2PSOBJ = arrow.o bound.o f2ps.o free.o read.o psfonts.o X X! ComplexProgramTarget(xfig) X X! SingleProgramTarget(f2p,$(F2POBJ),,) X X! SingleProgramTarget(f2ps,$(F2PSOBJ),,) X--- 1,49 ---- X SYS_LIBRARIES = -lm X! DEPLIBS = XawClientDepLibs X LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) X X X! XFIGSRC = addpt.c arc.c arcbox.c arrow.c autoarrow.c bitmap.c\ X! blink.c bound.c box.c break.c canvas.c changestyle.c\ X! changetext.c changethick.c char.c color.c copy.c\ X! cursor.c curve.c deletept.c dir.c drag.c draw.c\ X! ellipse.c file.c flip.c font.c free.c geom.c\ X! global.c glue.c graphics.c grid.c intspline.c\ X! latex_line.c line.c list.c main.c move.c movept.c\ X! msgsw.c panel.c popup.c print.c printfonts.c psbits.c\ X! psfonts.c puterr.c read.c read1_3.c redisplay.c\ X! remove.c rotate.c ruler.c save.c scale.c search.c\ X! spline.c text.c trans.c turn.c undo.c util.c xtra.c X X! XFIGOBJ = addpt.o arc.o arcbox.o arrow.o autoarrow.o bitmap.o\ X! blink.o bound.o box.o break.o canvas.o changestyle.o\ X! changetext.o changethick.o char.o color.o copy.o\ X! cursor.o curve.o deletept.o dir.o drag.o draw.o\ X! ellipse.o file.o flip.o font.o free.o geom.o global.o\ X! glue.o graphics.o grid.o intspline.o latex_line.o\ X! line.o list.o main.o move.o movept.o msgsw.o panel.o\ X! popup.o print.o printfonts.o psbits.o psfonts.o\ X! puterr.o read.o read1_3.o redisplay.o remove.o\ X! rotate.o ruler.o save.o scale.o search.o spline.o\ X! text.o trans.o turn.o undo.o util.o xtra.o X X+ F2PSRC = arrow.c f2p.c free.c read.c troff_fonts.c psfonts.c X+ F2POBJ = arrow.o f2p.o free.o read.o troff_fonts.o psfonts.o X+ X F2PSSRC = arrow.c bound.c f2ps.c free.c read.c psfonts.c X F2PSOBJ = arrow.o bound.o f2ps.o free.o read.o psfonts.o X X! SRCS1 = $(XFIGSRC) X! OBJS1 = $(XFIGOBJ) X! SRCS2 = $(F2PSRC) X! OBJS2 = $(F2POBJ) X! SRCS3 = $(F2PSSRC) X! OBJS3 = $(F2PSOBJ) X X! PROGRAMS = xfig f2p f2ps X X! ComplexProgramTarget_1(xfig,$(LOCAL_LIBRARIES),) X! X! ComplexProgramTarget_2(f2p,,) X! X! ComplexProgramTarget_3(f2ps,,) END_OF_FILE if test 3944 -ne `wc -c <'Imakefile.diff'`; then echo shar: \"'Imakefile.diff'\" unpacked with wrong size! fi # end of 'Imakefile.diff' fi if test -f 'arc.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'arc.c.diff'\" else echo shar: Extracting \"'arc.c.diff'\" $3274 characters$ sed "s/^X//" >'arc.c.diff' <<'END_OF_FILE' X*** arc.c.p5 Tue Jan 16 17:21:02 1990 X--- arc.c Sat Mar 17 13:32:21 1990 X*************** X*** 20,26 **** X extern int fix_x, fix_y, cur_x, cur_y; X X extern int autoforwardarrow_mode, autobackwardarrow_mode; X! extern int cur_line_style, line_thickness; X extern float cur_styleval; X extern int cur_color; X extern int cur_areafill; X--- 20,26 ---- X extern int fix_x, fix_y, cur_x, cur_y; X X extern int autoforwardarrow_mode, autobackwardarrow_mode; X! extern int line_style, line_thickness; X extern float cur_styleval; X extern int cur_color; X extern int cur_areafill; X*************** X*** 27,34 **** X extern int fill_mode; X extern float cur_dashlength; X extern int num_point; X- extern int DEBUG; X extern F_compound objects; X X extern freehand_elasticline(); X extern (*canvas_kbd_proc)(); X--- 27,34 ---- X extern int fill_mode; X extern float cur_dashlength; X extern int num_point; X extern F_compound objects; X+ extern appresStruct appres; X X extern freehand_elasticline(); X extern (*canvas_kbd_proc)(); X*************** X*** 111,117 **** X x = point[0].x; y = point[0].y; X for (i = 1; i < num_point; i++) { X pw_vector(canvas_pixwin, x, y, point[i].x, point[i].y, INV_PAINT, X! 1); X x = point[i].x; y = point[i].y; X } X if (num_point < 3) { X--- 111,117 ---- X x = point[0].x; y = point[0].y; X for (i = 1; i < num_point; i++) { X pw_vector(canvas_pixwin, x, y, point[i].x, point[i].y, INV_PAINT, X! 1, SOLID_LINE, 0.0); X x = point[i].x; y = point[i].y; X } X if (num_point < 3) { X*************** X*** 130,136 **** X return; X } X arc->type = T_3_POINTS_ARC; X! arc->style = cur_line_style; X arc->thickness = line_thickness; X arc->style_val = cur_styleval; X arc->pen = NULL; X--- 130,136 ---- X return; X } X arc->type = T_3_POINTS_ARC; X! arc->style = line_style; X arc->thickness = line_thickness; X arc->style_val = cur_styleval; X arc->pen = NULL; X*************** X*** 156,169 **** X arc->point[2].x = point[2].x; X arc->point[2].y = point[2].y; X arc->next = NULL; X- pw_batch_on(canvas_pixwin); X draw_arc(arc, foreground_color); X! if (DEBUG) { X int xmin, ymin, xmax, ymax; X arc_bound(arc, &xmin, &ymin, &xmax, &ymax); X! draw_rectbox(xmin, ymin, xmax, ymax, PAINT, 1); X } X- pw_batch_off(canvas_pixwin); X clean_up(); X set_action_object(F_CREATE, O_ARC); X insert_arc(&objects.arcs, arc); X--- 156,167 ---- X arc->point[2].x = point[2].x; X arc->point[2].y = point[2].y; X arc->next = NULL; X draw_arc(arc, foreground_color); X! if (appres.DEBUG) { X int xmin, ymin, xmax, ymax; X arc_bound(arc, &xmin, &ymin, &xmax, &ymax); X! draw_rectbox(xmin, ymin, xmax, ymax, PAINT); X } X clean_up(); X set_action_object(F_CREATE, O_ARC); X insert_arc(&objects.arcs, arc); X*************** X*** 186,192 **** X round(a->center.y - a->point[2].y), X a->direction, 1, 1, X round(a->center.x), round(a->center.y), op, X! a->thickness, a->area_fill); X draw_arcarrow(a, op); X } X X--- 184,190 ---- X round(a->center.y - a->point[2].y), X a->direction, 1, 1, X round(a->center.x), round(a->center.y), op, X! a->thickness, a->style, a->style_val, a->area_fill); X draw_arcarrow(a, op); X } X END_OF_FILE if test 3274 -ne `wc -c <'arc.c.diff'`; then echo shar: \"'arc.c.diff'\" unpacked with wrong size! fi # end of 'arc.c.diff' fi if test -f 'changestyle.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'changestyle.c.diff'\" else echo shar: Extracting \"'changestyle.c.diff'\" $3600 characters$ sed "s/^X//" >'changestyle.c.diff' <<'END_OF_FILE' X*** changestyle.c.p5 Tue Jan 16 17:22:14 1990 X--- changestyle.c Fri Mar 16 14:20:23 1990 X*************** X*** 33,39 **** X X extern int foreground_color, background_color; X extern int compoundbox_shown; X! extern int cur_line_style; X extern float cur_styleval; X X extern change_style(); X--- 33,39 ---- X X extern int foreground_color, background_color; X extern int compoundbox_shown; X! extern int line_style; X extern float cur_styleval; X X extern change_style(); X*************** X*** 63,69 **** X if ((l = line_search(x, y, TOLERANCE, &px, &py)) != NULL) { X win_setmouseposition(canvas_swfd, px, py); X draw_line(l, ERASE); X! l->style = cur_line_style; X l->style_val = cur_styleval; X draw_line(l, PAINT); X clean_up(); X--- 63,69 ---- X if ((l = line_search(x, y, TOLERANCE, &px, &py)) != NULL) { X win_setmouseposition(canvas_swfd, px, py); X draw_line(l, ERASE); X! l->style = line_style; X l->style_val = cur_styleval; X draw_line(l, PAINT); X clean_up(); X*************** X*** 73,84 **** X } X else if ((e = ellipse_search(x, y, TOLERANCE, &px, &py)) != NULL) { X win_setmouseposition(canvas_swfd, px, py); X- pw_batch_on(canvas_pixwin); X draw_ellipse(e, background_color); X! e->style = cur_line_style; X e->style_val = cur_styleval; X draw_ellipse(e, foreground_color); X- pw_batch_off(canvas_pixwin); X clean_up(); X set_action_object(F_CHANGE_STYLE, O_ELLIPSE); X set_latestellipse(e); X--- 73,82 ---- X } X else if ((e = ellipse_search(x, y, TOLERANCE, &px, &py)) != NULL) { X win_setmouseposition(canvas_swfd, px, py); X draw_ellipse(e, background_color); X! e->style = line_style; X e->style_val = cur_styleval; X draw_ellipse(e, foreground_color); X clean_up(); X set_action_object(F_CHANGE_STYLE, O_ELLIPSE); X set_latestellipse(e); X*************** X*** 86,97 **** X } X else if ((a = arc_search(x, y, TOLERANCE, &px, &py)) != NULL) { X win_setmouseposition(canvas_swfd, px, py); X- pw_batch_on(canvas_pixwin); X draw_arc(a, background_color); X! a->style = cur_line_style; X a->style_val = cur_styleval; X draw_arc(a, foreground_color); X- pw_batch_off(canvas_pixwin); X clean_up(); X set_action_object(F_CHANGE_STYLE, O_ARC); X set_latestarc(a); X--- 84,93 ---- X } X else if ((a = arc_search(x, y, TOLERANCE, &px, &py)) != NULL) { X win_setmouseposition(canvas_swfd, px, py); X draw_arc(a, background_color); X! a->style = line_style; X a->style_val = cur_styleval; X draw_arc(a, foreground_color); X clean_up(); X set_action_object(F_CHANGE_STYLE, O_ARC); X set_latestarc(a); X*************** X*** 99,110 **** X } X else if ((s = spline_search(x, y, TOLERANCE, &px, &py)) != NULL) { X win_setmouseposition(canvas_swfd, px, py); X- pw_batch_on(canvas_pixwin); X draw_spline(s, ERASE); X! s->style = cur_line_style; X s->style_val = cur_styleval; X draw_spline(s, PAINT); X- pw_batch_off(canvas_pixwin); X clean_up(); X set_action_object(F_CHANGE_STYLE, O_SPLINE); X set_latestspline(s); X--- 95,104 ---- X } X else if ((s = spline_search(x, y, TOLERANCE, &px, &py)) != NULL) { X win_setmouseposition(canvas_swfd, px, py); X draw_spline(s, ERASE); X! s->style = line_style; X s->style_val = cur_styleval; X draw_spline(s, PAINT); X clean_up(); X set_action_object(F_CHANGE_STYLE, O_SPLINE); X set_latestspline(s); END_OF_FILE if test 3600 -ne `wc -c <'changestyle.c.diff'`; then echo shar: \"'changestyle.c.diff'\" unpacked with wrong size! fi # end of 'changestyle.c.diff' fi if test -f 'drag.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'drag.c.diff'\" else echo shar: Extracting \"'drag.c.diff'\" $4181 characters$ sed "s/^X//" >'drag.c.diff' <<'END_OF_FILE' X*** drag.c.p5 Tue Jan 16 17:21:04 1990 X--- drag.c Sat Mar 17 13:33:29 1990 X*************** X*** 38,44 **** X place_compound(); X X static F_arc *arc; X! static F_compound *compound; X static F_ellipse *ellipse; X static F_line *line; X static F_spline *spline; X--- 38,44 ---- X place_compound(); X X static F_arc *arc; X! static F_compound *cmpnd; X static F_ellipse *ellipse; X static F_line *line; X static F_spline *spline; X*************** X*** 54,63 **** X x2 = cur_x + x2off; X y1 = cur_y + y1off; X y2 = cur_y + y2off; X! pw_vector(canvas_pixwin, x1, y1, x1, y2, op, 1); X! pw_vector(canvas_pixwin, x1, y2, x2, y2, op, 1); X! pw_vector(canvas_pixwin, x2, y2, x2, y1, op, 1); X! pw_vector(canvas_pixwin, x2, y1, x1, y1, op, 1); X } X X move_movingbox(x, y) X--- 54,60 ---- X x2 = cur_x + x2off; X y1 = cur_y + y1off; X y2 = cur_y + y2off; X! draw_rectbox(x1, y1, x2, y2, op); X } X X move_movingbox(x, y) X*************** X*** 95,103 **** X new_position.x = x; X new_position.y = y; X translate_ellipse(ellipse, x - last_position.x, y - last_position.y); X- pw_batch_on(canvas_pixwin); X draw_ellipse(ellipse, foreground_color); X- pw_batch_off(canvas_pixwin); X show_pointmarker(); X set_modifiedflag(); X (*return_proc)(); X--- 92,98 ---- X*************** X*** 134,142 **** X new_position.x = x; X new_position.y = y; X translate_arc(arc, x - fix_x, y - fix_y); X- pw_batch_on(canvas_pixwin); X draw_arc(arc, foreground_color); X- pw_batch_off(canvas_pixwin); X show_pointmarker(); X set_modifiedflag(); X (*return_proc)(); X--- 129,135 ---- X*************** X*** 151,159 **** X dx = cur_x - fix_x; X dy = cur_y - fix_y; X pw_vector(canvas_pixwin, a->point[0].x+dx, a->point[0].y+dy, X! a->point[1].x+dx, a->point[1].y+dy, op, 1); X pw_vector(canvas_pixwin, a->point[1].x+dx, a->point[1].y+dy, X! a->point[2].x+dx, a->point[2].y+dy, op, 1); X } X X /************************* line section **********************/ X--- 144,152 ---- X dx = cur_x - fix_x; X dy = cur_y - fix_y; X pw_vector(canvas_pixwin, a->point[0].x+dx, a->point[0].y+dy, X! a->point[1].x+dx, a->point[1].y+dy, op, 1, SOLID_LINE, 0.0); X pw_vector(canvas_pixwin, a->point[1].x+dx, a->point[1].y+dy, X! a->point[2].x+dx, a->point[2].y+dy, op, 1, SOLID_LINE, 0.0); X } X X /************************* line section **********************/ X*************** X*** 207,215 **** X y = p->y + dy; X for (p = p->next; p != NULL; x = xx, y = yy, p = p->next) { X xx = p->x + dx; yy = p->y +dy; X! pw_vector(canvas_pixwin, x, y, xx, yy, op, 1); X } X! } X X /************************ text section **************************/ X X--- 200,208 ---- X y = p->y + dy; X for (p = p->next; p != NULL; x = xx, y = yy, p = p->next) { X xx = p->x + dx; yy = p->y +dy; X! pw_vector(canvas_pixwin, x, y, xx, yy, op, 1, SOLID_LINE, 0.0); X } X! } X X /************************ text section **************************/ X X*************** X*** 304,312 **** X translate_spline(spline, x - fix_x, y - fix_y); X new_position.x = x; X new_position.y = y; X- pw_batch_on(canvas_pixwin); X draw_spline(spline, PAINT); X- pw_batch_off(canvas_pixwin); X show_pointmarker(); X set_modifiedflag(); X (*return_proc)(); X--- 297,303 ---- X*************** X*** 318,324 **** X F_compound *c; X int x, y; X { X! compound = c; X last_position.x = cur_x = x; X last_position.y = cur_y = y; X x1off = c->nwcorner.x - x; X--- 309,315 ---- X F_compound *c; X int x, y; X { X! cmpnd = c; X last_position.x = cur_x = x; X last_position.y = cur_y = y; X x1off = c->nwcorner.x - x; X*************** X*** 337,345 **** X draw_movingbox(INV_PAINT); X new_position.x = x; X new_position.y = y; X! translate_compound(compound, x - last_position.x, y - last_position.y); X! draw_compound(compound); X! draw_compoundbox(compound, INV_PAINT); X set_modifiedflag(); X (*return_proc)(); X } X--- 328,336 ---- X draw_movingbox(INV_PAINT); X new_position.x = x; X new_position.y = y; X! translate_compound(cmpnd, x - last_position.x, y - last_position.y); X! draw_compound(cmpnd); X! draw_compoundbox(cmpnd, INV_PAINT); X set_modifiedflag(); X (*return_proc)(); X } END_OF_FILE if test 4181 -ne `wc -c <'drag.c.diff'`; then echo shar: \"'drag.c.diff'\" unpacked with wrong size! fi # end of 'drag.c.diff' fi if test -f 'ellipse.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'ellipse.c.diff'\" else echo shar: Extracting \"'ellipse.c.diff'\" $5916 characters$ sed "s/^X//" >'ellipse.c.diff' <<'END_OF_FILE' X*** ellipse.c.p5 Tue Jan 16 17:21:05 1990 X--- ellipse.c Sat Mar 17 13:33:46 1990 X*************** X*** 14,20 **** X #include "object.h" X #include "paintop.h" X X! extern int cur_line_style, line_thickness; X extern float cur_styleval; X extern float cur_angle; X extern int cur_color; X--- 14,20 ---- X #include "object.h" X #include "paintop.h" X X! extern int line_style, line_thickness; X extern float cur_styleval; X extern float cur_angle; X extern int cur_color; X*************** X*** 50,57 **** X center_marker(x, y) X int x, y; X { X! pw_vector(canvas_pixwin, x, y-2, x, y+2, INV_PAINT, 1); X! pw_vector(canvas_pixwin, x-2, y, x+2, y, INV_PAINT, 1); X } X X ellipsebyradius_drawing_selected() X--- 50,57 ---- X center_marker(x, y) X int x, y; X { X! pw_vector(canvas_pixwin, x, y-2, x, y+2, INV_PAINT, 1, SOLID_LINE, 0.0); X! pw_vector(canvas_pixwin, x-2, y, x+2, y, INV_PAINT, 1, SOLID_LINE, 0.0); X } X X ellipsebyradius_drawing_selected() X*************** X*** 100,106 **** X x2 = fix_x - rx; X y1 = fix_y + ry; X y2 = fix_y - ry; X! draw_rectbox(x1, y1, x2, y2, op, 1); X } X X create_ellipsebyrad(x, y) X--- 100,106 ---- X x2 = fix_x - rx; X y1 = fix_y + ry; X y2 = fix_y - ry; X! draw_rectbox(x1, y1, x2, y2, op); X } X X create_ellipsebyrad(x, y) X*************** X*** 116,122 **** X return; X } X ellipse->type = T_ELLIPSE_BY_RAD; X! ellipse->style = cur_line_style; X ellipse->thickness = line_thickness; X ellipse->style_val = cur_styleval; X ellipse->angle = cur_angle; X--- 116,122 ---- X return; X } X ellipse->type = T_ELLIPSE_BY_RAD; X! ellipse->style = line_style; X ellipse->thickness = line_thickness; X ellipse->style_val = cur_styleval; X ellipse->angle = cur_angle; X*************** X*** 135,143 **** X ellipse->end.x = x; X ellipse->end.y = y; X ellipse->next = NULL; X- pw_batch_on(canvas_pixwin); X draw_ellipse(ellipse, DRAW); X- pw_batch_off(canvas_pixwin); X clean_up(); X set_action_object(F_CREATE, O_ELLIPSE); X insert_ellipse(&objects.ellipses, ellipse); X--- 135,141 ---- X*************** X*** 183,189 **** X ellipsebydia_box(op) X int op; X { X! draw_rectbox(fix_x, fix_y, cur_x, cur_y, op, 1); X } X X create_ellipsebydia(x, y) X--- 181,187 ---- X ellipsebydia_box(op) X int op; X { X! draw_rectbox(fix_x, fix_y, cur_x, cur_y, op); X } X X create_ellipsebydia(x, y) X*************** X*** 199,205 **** X return; X } X ellipse->type = T_ELLIPSE_BY_DIA; X! ellipse->style = cur_line_style; X ellipse->thickness = line_thickness; X ellipse->style_val = cur_styleval; X ellipse->angle = cur_angle; X--- 197,203 ---- X return; X } X ellipse->type = T_ELLIPSE_BY_DIA; X! ellipse->style = line_style; X ellipse->thickness = line_thickness; X ellipse->style_val = cur_styleval; X ellipse->angle = cur_angle; X*************** X*** 218,226 **** X ellipse->end.x = x; X ellipse->end.y = y; X ellipse->next = NULL; X- pw_batch_on(canvas_pixwin); X draw_ellipse(ellipse, DRAW); X- pw_batch_off(canvas_pixwin); X clean_up(); X set_action_object(F_CREATE, O_ELLIPSE); X insert_ellipse(&objects.ellipses, ellipse); X--- 216,222 ---- X*************** X*** 278,285 **** X x2 = fix_x - radius; X y1 = fix_y + radius; X y2 = fix_y - radius; X! draw_rectbox(x1, y1, x2, y2, op, 1); X! pw_vector(canvas_pixwin, fix_x, fix_y, cur_x, cur_y, op, 1); X } X X create_circlebyrad(x, y) X--- 274,281 ---- X x2 = fix_x - radius; X y1 = fix_y + radius; X y2 = fix_y - radius; X! draw_rectbox(x1, y1, x2, y2, op); X! pw_vector(canvas_pixwin, fix_x, fix_y, cur_x, cur_y, op, 1, SOLID_LINE, 0.0); X } X X create_circlebyrad(x, y) X*************** X*** 296,302 **** X return; X } X c->type = T_CIRCLE_BY_RAD; X! c->style = cur_line_style; X c->thickness = line_thickness; X c->style_val = cur_styleval; X c->angle = 0.0; X--- 292,298 ---- X return; X } X c->type = T_CIRCLE_BY_RAD; X! c->style = line_style; X c->thickness = line_thickness; X c->style_val = cur_styleval; X c->angle = 0.0; X*************** X*** 315,323 **** X c->end.x = x; X c->end.y = y; X c->next = NULL; X- pw_batch_on(canvas_pixwin); X draw_ellipse(c, DRAW); X- pw_batch_off(canvas_pixwin); X clean_up(); X set_action_object(F_CREATE, O_ELLIPSE); X insert_ellipse(&objects.ellipses, c); X--- 311,317 ---- X*************** X*** 373,380 **** X x2 = fix_x + rx - radius; X y1 = fix_y + ry + radius; X y2 = fix_y + ry - radius; X! draw_rectbox(x1, y1, x2, y2, op, 1); X! pw_vector(canvas_pixwin, fix_x, fix_y, cur_x, cur_y, op, 1); X } X X create_circlebydia(x, y) X--- 367,374 ---- X x2 = fix_x + rx - radius; X y1 = fix_y + ry + radius; X y2 = fix_y + ry - radius; X! draw_rectbox(x1, y1, x2, y2, op); X! pw_vector(canvas_pixwin, fix_x, fix_y, cur_x, cur_y, op, 1, SOLID_LINE, 0.0); X } X X create_circlebydia(x, y) X*************** X*** 391,397 **** X return; X } X c->type = T_CIRCLE_BY_DIA; X! c->style = cur_line_style; X c->thickness = line_thickness; X c->style_val = cur_styleval; X c->angle = 0.0; X--- 385,391 ---- X return; X } X c->type = T_CIRCLE_BY_DIA; X! c->style = line_style; X c->thickness = line_thickness; X c->style_val = cur_styleval; X c->angle = 0.0; X*************** X*** 410,418 **** X c->end.x = x; X c->end.y = y; X c->next = NULL; X- pw_batch_on(canvas_pixwin); X draw_ellipse(c, DRAW); X- pw_batch_off(canvas_pixwin); X clean_up(); X set_action_object(F_CREATE, O_ELLIPSE); X insert_ellipse(&objects.ellipses, c); X--- 404,410 ---- X*************** X*** 430,434 **** X a = e->radiuses.x; X b = e->radiuses.y; X curve(canvas_pixwin, a, 0, a, 0, e->direction, (b*b), (a*a), X! e->center.x, e->center.y, op, e->thickness, e->area_fill); X } X--- 422,427 ---- X a = e->radiuses.x; X b = e->radiuses.y; X curve(canvas_pixwin, a, 0, a, 0, e->direction, (b*b), (a*a), X! e->center.x, e->center.y, op, X! e->thickness, e->style, e->style_val, e->area_fill); X } END_OF_FILE if test 5916 -ne `wc -c <'ellipse.c.diff'`; then echo shar: \"'ellipse.c.diff'\" unpacked with wrong size! fi # end of 'ellipse.c.diff' fi if test -f 'f2p.man.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'f2p.man.diff'\" else echo shar: Extracting \"'f2p.man.diff'\" $4627 characters$ sed "s/^X//" >'f2p.man.diff' <<'END_OF_FILE' X*** f2p.man.p5 Tue Jan 16 17:21:05 1990 X--- f2p.man Tue Mar 27 08:22:47 1990 X*************** X*** 1,4 X! .TH F2P 1 "29 March 1988" X .SH NAME X f2p \- translates fig output into pic language X .SH SYNOPSIS X X--- 1,4 ----- X! .TH F2P 1 "12 March 1990" X .SH NAME X f2p \- translates fig output into pic language X .SH SYNOPSIS X*************** X*** 3,9 X f2p \- translates fig output into pic language X .SH SYNOPSIS X .B f2p X! [-s font_size] [ input_file [ output_file ] ] X .SH DESCRIPTION X .I F2p X translates fig objects in the named X X--- 3,9 ----- X f2p \- translates fig output into pic language X .SH SYNOPSIS X .B f2p X! [ -f font_file ] [ input_file [ output_file ] ] X .SH DESCRIPTION X .I F2p X translates fig objects in the named X*************** X*** 8,14 X .I F2p X translates fig objects in the named X .I input_file X! into pic language and put them in X .I output_file. X If only one file name is presented, it is assumed to be the input file X (fig output file). The output file X X--- 8,14 ----- X .I F2p X translates fig objects in the named X .I input_file X! into pic language and puts them in X .I output_file. X If only one file name is present, it is assumed to be the input file X (fig output file). X*************** X*** 10,17 X .I input_file X into pic language and put them in X .I output_file. X! If only one file name is presented, it is assumed to be the input file X! (fig output file). The output file X .I (pic_file), X if not presented, will be the stdout. X If the X X--- 10,18 ----- X .I input_file X into pic language and puts them in X .I output_file. X! If only one file name is present, it is assumed to be the input file X! (fig output file). X! The output file X .I (pic_file), X if not present, will be the stdout. X If the X*************** X*** 13,19 X If only one file name is presented, it is assumed to be the input file X (fig output file). The output file X .I (pic_file), X! if not presented, will be the stdout. X If the X .I input_file X is not presented, input will be assumed to come from the stdin. X X--- 14,20 ----- X (fig output file). X The output file X .I (pic_file), X! if not present, will be the stdout. X If the X .I input_file X is not present, input will be assumed to come from the stdin. X*************** X*** 16,23 X if not presented, will be the stdout. X If the X .I input_file X! is not presented, input will be assumed to come from the stdin. X! The output from f2p can be edited to change font sizes/types. X .PP X The unit of X .I font_size X X--- 17,23 ----- X if not present, will be the stdout. X If the X .I input_file X! is not present, input will be assumed to come from the stdin. X .PP X The fonts used for text objects are converted from their LaserWriter X names (as selected when using fig) to site-specific X*************** X*** 19,31 X is not presented, input will be assumed to come from the stdin. X The output from f2p can be edited to change font sizes/types. X .PP X! The unit of X! .I font_size X! is point. There are 72 points in an inch. X! The upper limit of font_size is 300 points (about 4 inches). X! The default size is 11 points. X! The position of text on the hard copy is depended on the specified X! font size. X .SH "SEE ALSO" X fig(1), X pic(1). X X--- 19,41 ----- X .I input_file X is not present, input will be assumed to come from the stdin. X .PP X! The fonts used for text objects are converted from their LaserWriter X! names (as selected when using fig) to site-specific X! troff 2-letter font names using X! information in the file /usr/lib/X11/troff/troff_ft_codes, X! or a file named using the optional X! .B \-f X! argument. X! If a file named with this option is not found in the working directory X! it will be sought in /usr/lib/X11/troff. X! .SH BUGS X! Filling of closed objects is ignored. X! It would be possible to generate X! .I pic X! instructions to produce some form of filling in X! .I f2p, X! but the filling feature really needs to be added to X! .I pic. X .SH "SEE ALSO" X xfig(1), X pic(1), X*************** X*** 27,34 X The position of text on the hard copy is depended on the specified X font size. X .SH "SEE ALSO" X! fig(1), X! pic(1). X .SH AUTHOR X Supoj Sutanthavibul (supoj@sally.UTEXAS.EDU), X .br X X--- 37,45 ----- X but the filling feature really needs to be added to X .I pic. X .SH "SEE ALSO" X! xfig(1), X! pic(1), X! f2ps(1). X .SH AUTHOR X Supoj Sutanthavibul (supoj@sally.UTEXAS.EDU), X .br X*************** X*** 35,37 X University of Texas at Austin, X .br X January 29, 1985. X X--- 46,51 ----- X University of Texas at Austin, X .br X January 29, 1985. X+ .br X+ Modified by daved@physiol.su.oz.au for fig 2.0 (March 1990). X+ END_OF_FILE if test 4627 -ne `wc -c <'f2p.man.diff'`; then echo shar: \"'f2p.man.diff'\" unpacked with wrong size! fi # end of 'f2p.man.diff' fi if test -f 'intspline.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'intspline.c.diff'\" else echo shar: Extracting \"'intspline.c.diff'\" $3742 characters$ sed "s/^X//" >'intspline.c.diff' <<'END_OF_FILE' X*** intspline.c.p5 Tue Jan 16 17:21:06 1990 X--- intspline.c Fri Mar 16 14:26:14 1990 X*************** X*** 22,28 **** X extern null_proc(); X extern set_popupmenu(); X X! extern int cur_line_style, line_thickness; X extern float cur_styleval; X extern int cur_color; X extern int cur_areafill; X--- 22,28 ---- X extern null_proc(); X extern set_popupmenu(); X X! extern int line_style, line_thickness; X extern float cur_styleval; X extern int cur_color; X extern int cur_areafill; X*************** X*** 34,41 **** X extern int autobackwardarrow_mode; X extern F_compound objects; X extern int num_point; X- extern int DEBUG; X extern F_point *first_point, *cur_point; X X int create_intsplineobject(); X init_intspline_drawing(); X--- 34,41 ---- X extern int autobackwardarrow_mode; X extern F_compound objects; X extern int num_point; X extern F_point *first_point, *cur_point; X+ extern appresStruct appres; X X int create_intsplineobject(); X init_intspline_drawing(); X*************** X*** 69,75 **** X draw_elasticline(); X if (num_point <= 2) { X pw_vector(canvas_pixwin, first_point->x, first_point->y, X! cur_point->x, cur_point->y, PAINT, 0); X if (num_point == 1) free((char*)cur_point); X free((char*)first_point); X draw_intspline_selected(); X--- 69,75 ---- X draw_elasticline(); X if (num_point <= 2) { X pw_vector(canvas_pixwin, first_point->x, first_point->y, X! cur_point->x, cur_point->y, PAINT, 1, SOLID_LINE, 0.0); X if (num_point == 1) free((char*)cur_point); X free((char*)first_point); X draw_intspline_selected(); X*************** X*** 81,87 **** X put_msg(Err_mem); X return; X } X! spline->style = cur_line_style; X spline->thickness = line_thickness; X spline->style_val = cur_styleval; X spline->color = cur_color; X--- 81,87 ---- X put_msg(Err_mem); X return; X } X! spline->style = line_style; X spline->thickness = line_thickness; X spline->style_val = cur_styleval; X spline->color = cur_color; X*************** X*** 114,127 **** X if (autobackwardarrow_mode) spline->back_arrow = backward_arrow(); X } X make_control_points(spline); X- pw_batch_on(canvas_pixwin); X draw_intspline(spline, PAINT); X! if (DEBUG) { X int xmin, ymin, xmax, ymax; X spline_bound(spline, &xmin, &ymin, &xmax, &ymax); X! draw_rectbox(xmin, ymin, xmax, ymax, PAINT, 1); X } X- pw_batch_off(canvas_pixwin); X clean_up(); X set_action_object(F_CREATE, O_SPLINE); X insert_spline(&objects.splines, spline); X--- 114,125 ---- X if (autobackwardarrow_mode) spline->back_arrow = backward_arrow(); X } X make_control_points(spline); X draw_intspline(spline, PAINT); X! if (appres.DEBUG) { X int xmin, ymin, xmax, ymax; X spline_bound(spline, &xmin, &ymin, &xmax, &ymax); X! draw_rectbox(xmin, ymin, xmax, ymax, PAINT); X } X clean_up(); X set_action_object(F_CREATE, O_SPLINE); X insert_spline(&objects.splines, spline); X*************** X*** 189,195 **** X for (p2 = p1->next, cp2 = cp1->next; p2 != NULL; X p1 = p2, cp1 = cp2, p2 = p2->next, cp2 = cp2->next) { X bezier_spline((float)p1->x, (float)p1->y, cp1->rx, cp1->ry, X! cp2->lx, cp2->ly, (float)p2->x, (float)p2->y, op, s->thickness); X } X if (s->for_arrow) X draw_arrow(round(cp1->lx), round(cp1->ly), p1->x, X--- 187,194 ---- X for (p2 = p1->next, cp2 = cp1->next; p2 != NULL; X p1 = p2, cp1 = cp2, p2 = p2->next, cp2 = cp2->next) { X bezier_spline((float)p1->x, (float)p1->y, cp1->rx, cp1->ry, X! cp2->lx, cp2->ly, (float)p2->x, (float)p2->y, op, X! s->thickness, s->style, s->style_val); X } X if (s->for_arrow) X draw_arrow(round(cp1->lx), round(cp1->ly), p1->x, END_OF_FILE if test 3742 -ne `wc -c <'intspline.c.diff'`; then echo shar: \"'intspline.c.diff'\" unpacked with wrong size! fi # end of 'intspline.c.diff' fi if test -f 'movept.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'movept.c.diff'\" else echo shar: Extracting \"'movept.c.diff'\" $4337 characters$ sed "s/^X//" >'movept.c.diff' <<'END_OF_FILE' X*** movept.c.p5 Tue Jan 16 17:21:07 1990 X--- movept.c Fri Mar 16 14:28:38 1990 X*************** X*** 209,215 **** X int dx, dy; X X set_temp_cursor(&wait_cursor); X- pw_batch_on(canvas_pixwin); X if (pointmarker_shown) toggle_ellipsepointmarker(ellipse); X draw_ellipse(ellipse, background_color); X if (point_num == 0) { /* starting point is selected */ X--- 209,214 ---- X*************** X*** 246,252 **** X } X draw_ellipse(ellipse, foreground_color); X if (pointmarker_shown) toggle_ellipsepointmarker(ellipse); X- pw_batch_off(canvas_pixwin); X reset_cursor(); X set_modifiedflag(); X } X--- 245,250 ---- X*************** X*** 301,318 **** X { X switch (movedpoint_num) { X case 0 : X! pw_vector(canvas_pixwin, cur_x, cur_y, X! arc->point[1].x, arc->point[1].y, op, 1); X break; X case 1 : X pw_vector(canvas_pixwin, arc->point[0].x, arc->point[0].y, X! cur_x, cur_y, op, 1); X pw_vector(canvas_pixwin, arc->point[2].x, arc->point[2].y, X! cur_x, cur_y, op, 1); X break; X default : X pw_vector(canvas_pixwin, arc->point[2].x, arc->point[2].y, X! cur_x, cur_y, op, 1); X } X } X X--- 299,316 ---- X { X switch (movedpoint_num) { X case 0 : X! pw_vector(canvas_pixwin, cur_x, cur_y, X! arc->point[1].x, arc->point[1].y, op, 1, SOLID_LINE, 0.0); X break; X case 1 : X pw_vector(canvas_pixwin, arc->point[0].x, arc->point[0].y, X! cur_x, cur_y, op, 1, SOLID_LINE, 0.0); X pw_vector(canvas_pixwin, arc->point[2].x, arc->point[2].y, X! cur_x, cur_y, op, 1, SOLID_LINE, 0.0); X break; X default : X pw_vector(canvas_pixwin, arc->point[2].x, arc->point[2].y, X! cur_x, cur_y, op, 1, SOLID_LINE, 0.0); X } X } X X*************** X*** 343,349 **** X p[movedpoint_num].y = y; X if (compute_arccenter(p[0], p[1], p[2], &xx, &yy)) { X set_temp_cursor(&wait_cursor); X- pw_batch_on(canvas_pixwin); X if (pointmarker_shown) toggle_arcpointmarker(arc); X draw_arc(arc, background_color); /* erase old arc */ X arc->point[movedpoint_num].x = x; X--- 341,346 ---- X*************** X*** 353,359 **** X arc->direction = compute_direction(p[0], p[1], p[2]); X draw_arc(arc, foreground_color); /* draw new arc */ X if (pointmarker_shown) toggle_arcpointmarker(arc); X- pw_batch_off(canvas_pixwin); X reset_cursor(); X set_modifiedflag(); X } X--- 350,355 ---- X*************** X*** 421,427 **** X F_point *moved_point; X { X set_temp_cursor(&wait_cursor); X- pw_batch_on(canvas_pixwin); X if (pointmarker_shown) toggle_splinepointmarker(s); X draw_spline(s, ERASE); /* erase old spline */ X moved_point->x = x; X--- 417,422 ---- X*************** X*** 433,439 **** X if (int_spline(s)) remake_control_points(s); X draw_spline(s, PAINT); /* draw spline with moved point */ X if (pointmarker_shown) toggle_splinepointmarker(s); X- pw_batch_off(canvas_pixwin); X reset_cursor(); X set_modifiedflag(); X } X--- 428,433 ---- X*************** X*** 515,521 **** X } X } X if (box_case) { X! draw_rectbox(fix_x, fix_y, cur_x, cur_y, INV_PAINT, 1); X canvas_locmove_proc = elastic_box; X canvas_middlebut_proc = fix_box; X } X--- 509,515 ---- X } X } X if (box_case) { X! draw_rectbox(fix_x, fix_y, cur_x, cur_y, INV_PAINT); X canvas_locmove_proc = elastic_box; X canvas_middlebut_proc = fix_box; X } X*************** X*** 561,567 **** X fix_box(x, y) X int x, y; X { X! draw_rectbox(fix_x, fix_y, cur_x, cur_y, INV_PAINT, 1); X new_position.x = x; X new_position.y = y; X clean_up(); X--- 555,561 ---- X fix_box(x, y) X int x, y; X { X! draw_rectbox(fix_x, fix_y, cur_x, cur_y, INV_PAINT); X new_position.x = x; X new_position.y = y; X clean_up(); X*************** X*** 659,668 **** X X if (left_point != NULL) { X pw_vector(canvas_pixwin, left_point->x, left_point->y, X! cur_x, cur_y, op, 1); X } X if ((p = moved_point->next) != NULL) { X! pw_vector(canvas_pixwin, p->x, p->y, cur_x, cur_y, op, 1); X } X } X X--- 653,662 ---- X X if (left_point != NULL) { X pw_vector(canvas_pixwin, left_point->x, left_point->y, X! cur_x, cur_y, op, 1, SOLID_LINE, 0.0); X } X if ((p = moved_point->next) != NULL) { X! pw_vector(canvas_pixwin, p->x, p->y, cur_x, cur_y, op, 1, SOLID_LINE, 0.0); X } X } X END_OF_FILE if test 4337 -ne `wc -c <'movept.c.diff'`; then echo shar: \"'movept.c.diff'\" unpacked with wrong size! fi # end of 'movept.c.diff' fi if test -f 'undo.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'undo.c.diff'\" else echo shar: Extracting \"'undo.c.diff'\" $4893 characters$ sed "s/^X//" >'undo.c.diff' <<'END_OF_FILE' X*** undo.c.p5 Tue Jan 16 17:21:09 1990 X--- undo.c Sat Mar 17 13:35:51 1990 X*************** X*** 219,231 **** X case O_ELLIPSE : X if (pointmarker_shown) X toggle_ellipsepointmarker(saved_objects.ellipses); X- pw_batch_on(canvas_pixwin); X draw_ellipse(saved_objects.ellipses, background_color); X flip_ellipse(saved_objects.ellipses, X last_position.x, last_position.y, X last_axis); X draw_ellipse(saved_objects.ellipses, foreground_color); X- pw_batch_off(canvas_pixwin); X if (pointmarker_shown) X toggle_ellipsepointmarker(saved_objects.ellipses); X break; X--- 219,229 ---- X*************** X*** 232,244 **** X case O_SPLINE : X if (pointmarker_shown) X toggle_splinepointmarker(saved_objects.splines); X- pw_batch_on(canvas_pixwin); X draw_spline(saved_objects.splines, ERASE); X flip_spline(saved_objects.splines, X last_position.x, last_position.y, X last_axis); X draw_spline(saved_objects.splines, PAINT); X- pw_batch_off(canvas_pixwin); X if (pointmarker_shown) X toggle_splinepointmarker(saved_objects.splines); X break; X--- 230,240 ---- X*************** X*** 245,257 **** X case O_ARC : X if (pointmarker_shown) X toggle_arcpointmarker(saved_objects.arcs); X- pw_batch_on(canvas_pixwin); X draw_arc(saved_objects.arcs, background_color); X flip_arc(saved_objects.arcs, X last_position.x, last_position.y, X last_axis); X draw_arc(saved_objects.arcs, foreground_color); X- pw_batch_off(canvas_pixwin); X if (pointmarker_shown) X toggle_arcpointmarker(saved_objects.arcs); X break; X--- 241,251 ---- X*************** X*** 288,298 **** X case O_ELLIPSE : X if (pointmarker_shown) X toggle_ellipsepointmarker(saved_objects.ellipses); X- pw_batch_on(canvas_pixwin); X draw_ellipse(saved_objects.ellipses, background_color); X translate_ellipse(saved_objects.ellipses, dx, dy); X draw_ellipse(saved_objects.ellipses, foreground_color); X- pw_batch_off(canvas_pixwin); X if (pointmarker_shown) X toggle_ellipsepointmarker(saved_objects.ellipses); X break; X--- 282,290 ---- X*************** X*** 304,314 **** X case O_SPLINE : X if (pointmarker_shown) X toggle_splinepointmarker(saved_objects.splines); X- pw_batch_on(canvas_pixwin); X draw_spline(saved_objects.splines, ERASE); X translate_spline(saved_objects.splines, dx, dy); X draw_spline(saved_objects.splines, PAINT); X- pw_batch_off(canvas_pixwin); X if (pointmarker_shown) X toggle_splinepointmarker(saved_objects.splines); X break; X--- 296,304 ---- X*************** X*** 315,325 **** X case O_ARC : X if (pointmarker_shown) X toggle_arcpointmarker(saved_objects.arcs); X- pw_batch_on(canvas_pixwin); X draw_arc(saved_objects.arcs, background_color); X translate_arc(saved_objects.arcs, dx, dy); X draw_arc(saved_objects.arcs, foreground_color); X- pw_batch_off(canvas_pixwin); X if (pointmarker_shown) X toggle_arcpointmarker(saved_objects.arcs); X break; X--- 305,313 ---- X*************** X*** 381,387 **** X case O_ELLIPSE : X if (pointmarker_shown) X toggle_ellipsepointmarker(saved_objects.ellipses); X- pw_batch_on(canvas_pixwin); X draw_ellipse(saved_objects.ellipses, background_color); X if (last_rotateangle == 90) last_rotateangle = 270; X else last_rotateangle = 90; X--- 369,374 ---- X*************** X*** 389,395 **** X last_position.x, last_position.y, X last_rotateangle); X draw_ellipse(saved_objects.ellipses, foreground_color); X- pw_batch_off(canvas_pixwin); X if (pointmarker_shown) X toggle_ellipsepointmarker(saved_objects.ellipses); X break; X--- 376,381 ---- X*************** X*** 396,402 **** X case O_SPLINE : X if (pointmarker_shown) X toggle_splinepointmarker(saved_objects.splines); X- pw_batch_on(canvas_pixwin); X draw_spline(saved_objects.splines, ERASE); X if (last_rotateangle == 90) last_rotateangle = 270; X else last_rotateangle = 90; X--- 382,387 ---- X*************** X*** 404,410 **** X last_position.x, last_position.y, X last_rotateangle); X draw_spline(saved_objects.splines, PAINT); X- pw_batch_off(canvas_pixwin); X if (pointmarker_shown) X toggle_splinepointmarker(saved_objects.splines); X break; X--- 389,394 ---- X*************** X*** 411,417 **** X case O_ARC : X if (pointmarker_shown) X toggle_arcpointmarker(saved_objects.arcs); X- pw_batch_on(canvas_pixwin); X draw_arc(saved_objects.arcs, background_color); X if (last_rotateangle == 90) last_rotateangle = 270; X else last_rotateangle = 90; X--- 395,400 ---- X*************** X*** 419,425 **** X last_position.x, last_position.y, X last_rotateangle); X draw_arc(saved_objects.arcs, foreground_color); X- pw_batch_off(canvas_pixwin); X if (pointmarker_shown) X toggle_arcpointmarker(saved_objects.arcs); X break; X--- 402,407 ---- END_OF_FILE if test 4893 -ne `wc -c <'undo.c.diff'`; then echo shar: \"'undo.c.diff'\" unpacked with wrong size! fi # end of 'undo.c.diff' fi if test -f 'xfig.man.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'xfig.man.diff'\" else echo shar: Extracting \"'xfig.man.diff'\" $4539 characters$ sed "s/^X//" >'xfig.man.diff' <<'END_OF_FILE' X*** xfig.man.p5 Tue Mar 13 17:11:10 1990 X--- xfig.man Tue Mar 27 16:09:24 1990 X*************** X*** 7,14 X [ \fB-le[ft]\fP ] X [ \fB-L[andscape]\fP ] X [ \fB-P[ortrait]\fP ] X! [ \fB-w[idth]\fP \fIunits\fP ] X! [ \fB-h[eight]\fP \fIunits\fP ] X [ \fB-not[rack]\fP ] X [ \fB-tr[ack]\fP ] X [ \fB-inc[hes]\fP ] X X--- 7,14 ----- X [ \fB-le[ft]\fP ] X [ \fB-L[andscape]\fP ] X [ \fB-P[ortrait]\fP ] X! [ \fB-pw[idth]\fP \fIunits\fP ] X! [ \fB-ph[eight]\fP \fIunits\fP ] X [ \fB-not[rack]\fP ] X [ \fB-tr[ack]\fP ] X [ \fB-inc[hes]\fP ] X*************** X*** 90,96 X .B \-P X Make \fIxfig\fP come up in portrait mode (7.5" x 10"). X .TP X! \fB-w\fP \fIunits\fP X Make \fIxfig\fP come up \fIunits\fP wide (where units are either cm or in). X .TP X \fB-h\fP \fIunits\fP X X--- 90,96 ----- X .B \-P X Make \fIxfig\fP come up in portrait mode (7.5" x 10"). X .TP X! \fB-pw\fP \fIunits\fP X Make \fIxfig\fP come up \fIunits\fP wide (where units are either cm or in). X .TP X \fB-ph\fP \fIunits\fP X*************** X*** 93,99 X \fB-w\fP \fIunits\fP X Make \fIxfig\fP come up \fIunits\fP wide (where units are either cm or in). X .TP X! \fB-h\fP \fIunits\fP X Make \fIxfig\fP come up \fIunits\fP high (where units are either cm or in). X .TP X \fB-tr\fP X X--- 93,99 ----- X \fB-pw\fP \fIunits\fP X Make \fIxfig\fP come up \fIunits\fP wide (where units are either cm or in). X .TP X! \fB-ph\fP \fIunits\fP X Make \fIxfig\fP come up \fIunits\fP high (where units are either cm or in). X .TP X \fB-tr\fP X*************** X*** 181,187 X shown on the canvas. X (The user will be asked for a file name.) X .TP X! .I Save as ... X Save objects on the screen into a file specified by the user. X (The user will be asked for a file name.) X .TP X X--- 181,187 ----- X shown on the canvas. X (The user will be asked for a file name.) X .TP X! .I Save in ... X Save objects on the screen into a file specified by the user. X (The user will be asked for a file name.) X If there is no current file name, it will be set to the name specified X*************** X*** 184,189 X .I Save as ... X Save objects on the screen into a file specified by the user. X (The user will be asked for a file name.) X .TP X .I Status X Show the name of the current file and directory. X X--- 184,191 ----- X .I Save in ... X Save objects on the screen into a file specified by the user. X (The user will be asked for a file name.) X+ If there is no current file name, it will be set to the name specified X+ in the save. X .TP X .I Status X Show the name of the current file and directory. X*************** X*** 479,486 X landscape X (boolean:true) -Landscape and -Portrait arguments X .TP X! width X! (integer:7.5 or 10 inches) -width argument X .TP X height X (integer:10 or 7.5 inches) -height argument X X--- 481,488 ----- X landscape X (boolean:true) -Landscape and -Portrait arguments X .TP X! pwidth X! (integer:7.5 or 10 inches) -pwidth argument X .TP X pheight X (integer:10 or 7.5 inches) -pheight argument X*************** X*** 482,489 X width X (integer:7.5 or 10 inches) -width argument X .TP X! height X! (integer:10 or 7.5 inches) -height argument X .TP X trackCursor X (boolean:on) -track and -notrack arguments X X--- 484,491 ----- X pwidth X (integer:7.5 or 10 inches) -pwidth argument X .TP X! pheight X! (integer:10 or 7.5 inches) -pheight argument X .TP X trackCursor X (boolean:on) -track and -notrack arguments X*************** X*** 509,515 X form(Form) X .TP X side panel X! form.panel(Form.Box) X .TP X bottom panel X form.bottom_panel(Form.Box) X X--- 511,517 ----- X form(Form) X .TP X side panel X! form.side_panel(Form.Box) X .TP X bottom panel X form.bottom_panel(Form.Box) X*************** X*** 514,521 X bottom panel X form.bottom_panel(Form.Box) X .TP X! icons X! form.panel.button(Form.Box.Command) X form.bottom_panel.button(Form.Box.Command) X .TP X top ruler X X--- 516,523 ----- X bottom panel X form.bottom_panel(Form.Box) X .TP X! buttons X! form.side_panel.button(Form.Box.Command) X form.bottom_panel.button(Form.Box.Command) X .TP X top ruler X*************** X*** 572,579 X .I grids X is on may appear ragged. This can be corrected by selecting \fIRedisplay\fP X from the pop-up menu. X- .PP X- The X11 cursors are not the original ones but chosen from X11's cursor font. X .SH "SEE ALSO" X Brian W. Kernighan X .I "PIC - A Graphics Language for Typesetting User Manual" X X--- 574,579 ----- X .I grids X is on may appear ragged. This can be corrected by selecting \fIRedisplay\fP X from the pop-up menu. X .SH "SEE ALSO" X Brian W. Kernighan X .I "PIC - A Graphics Language for Typesetting User Manual" END_OF_FILE if test 4539 -ne `wc -c <'xfig.man.diff'`; then echo shar: \"'xfig.man.diff'\" unpacked with wrong size! fi # end of 'xfig.man.diff' fi echo shar: End of archive 2 $of 7$. cp /dev/null ark2isdone MISSING="" for I in 1 2 3 4 5 6 7 ; do if test ! -f ark${I}isdone ; then MISSING="${MISSING} ${I}" fi done if test "${MISSING}" = "" ; then echo You have unpacked all 7 archives. rm -f ark[1-9]isdone else echo You still need to unpack the following archives: echo " " ${MISSING} fi ## End of shell archive. exit 0 dan ----------------------------------------------------------- O'Reilly && Associates argv@sun.com / argv@ora.com 632 Petaluma Ave, Sebastopol, CA 95472 800-338-NUTS, in CA: 800-533-NUTS, FAX 707-829-0104 Opinions expressed reflect those of the author only.